Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Mon, 28 Jun 2010 13:32:47 +0000 (13:32 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Mon, 28 Jun 2010 13:32:47 +0000 (13:32 +0000)
commit2f46df43aa95af8e966f9a1d7259ba1bec61b566
tree3fd1833a305abc5aefdb872efaa48ddaa2b6c0b3
parentecbe2036d92f4fdda71706306fd10651c49d7edf
parent53722fc0266252a294a3bd78051732033cab7988
Merge from mainline.